bitkeeper revision 1.996 (40d7f3c2ByN1WWCHbNtt1l_a8at-GQ)
authorxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Tue, 22 Jun 2004 08:54:26 +0000 (08:54 +0000)
committerxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Tue, 22 Jun 2004 08:54:26 +0000 (08:54 +0000)
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk

1  2 
.rootkeys

diff --cc .rootkeys
Simple merge